From 569204f34df5e078cebd3edd8f01c1ed5d9ee64f Mon Sep 17 00:00:00 2001 From: robertlipe Date: Fri, 16 Aug 2013 06:19:05 +0000 Subject: [PATCH] Remove another implicit time_t conversion. --- gpsbabel/cetus.cc | 2 +- gpsbabel/exif.cc | 4 ++-- gpsbabel/garmin_txt.cc | 4 ++-- gpsbabel/gdb.cc | 4 ++-- gpsbabel/gopal.cc | 2 +- gpsbabel/gtm.cc | 2 +- gpsbabel/gtrnctr.cc | 4 ++-- gpsbabel/igo8.cc | 2 +- gpsbabel/interpolate.cc | 6 +++--- gpsbabel/itracku.cc | 2 +- gpsbabel/kml.cc | 8 ++++---- gpsbabel/lowranceusr.cc | 2 +- gpsbabel/mtk_logger.cc | 2 +- gpsbabel/netstumbler.cc | 2 +- gpsbabel/random.cc | 2 +- gpsbabel/src/core/datetime.h | 6 +----- gpsbabel/unicsv.cc | 4 ++-- 17 files changed, 27 insertions(+), 31 deletions(-) diff --git a/gpsbabel/cetus.cc b/gpsbabel/cetus.cc index d5d05e3b6..d96e5c393 100644 --- a/gpsbabel/cetus.cc +++ b/gpsbabel/cetus.cc @@ -366,7 +366,7 @@ read_waypts(const pdbfile* pdb) tm.tm_mon = rec->mon - 1; tm.tm_year = be_read16(&rec->year) - 1900; - wpt_tmp->creation_time = mkgmtime(&tm); + wpt_tmp->SetCreationTime(mkgmtime(&tm)); } diff --git a/gpsbabel/exif.cc b/gpsbabel/exif.cc index d65e94a6e..51c48af32 100644 --- a/gpsbabel/exif.cc +++ b/gpsbabel/exif.cc @@ -856,9 +856,9 @@ exif_waypt_from_exif_app(exif_app_t* app) printf(MYNAME "-GPSTimeStamp = %s\n", str); xfree(str); #endif - wpt->creation_time = timestamp; + wpt->SetCreationTime(timestamp); } else { - wpt->creation_time = exif_get_exif_time(app); + wpt->SetCreationTime(exif_get_exif_time(app)); } tag = exif_find_tag(app, EXIF_IFD, EXIF_IFD_TAG_USER_CMT); /* UserComment */ diff --git a/gpsbabel/garmin_txt.cc b/gpsbabel/garmin_txt.cc index 922e5eb89..10abf14c9 100644 --- a/gpsbabel/garmin_txt.cc +++ b/gpsbabel/garmin_txt.cc @@ -1196,7 +1196,7 @@ parse_waypoint(void) case 16: { time_t ct; parse_date_and_time(str, &ct); - wpt->creation_time = ct; + wpt->SetCreationTime(ct); } break; case 17: { @@ -1315,7 +1315,7 @@ parse_track_waypoint(void) case 2: { time_t ct; parse_date_and_time(str, &ct); - wpt->creation_time = ct; + wpt->SetCreationTime(ct); } break; case 3: diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc index 9efec606a..e44c070d1 100644 --- a/gpsbabel/gdb.cc +++ b/gpsbabel/gdb.cc @@ -698,7 +698,7 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out) } } if (FREAD_C == 1) { - res->creation_time = FREAD_i32; + res->SetCreationTime(FREAD_i32); } /* VERSION DEPENDENT CODE */ @@ -993,7 +993,7 @@ read_track(void) } } if (FREAD_C == 1) { - wpt->creation_time = FREAD_i32; + wpt->SetCreationTime(FREAD_i32); } if (FREAD_C == 1) { WAYPT_SET(wpt, depth, FREAD_DBL); diff --git a/gpsbabel/gopal.cc b/gpsbabel/gopal.cc index 3bb16ce7d..238817b12 100644 --- a/gpsbabel/gopal.cc +++ b/gpsbabel/gopal.cc @@ -234,7 +234,7 @@ gopal_read(void) tm.tm_mon=trackdate.tm_mon; tm.tm_mday=trackdate.tm_mday; // This will probably be overwritten by field 9...if we have 9 fields. - wpt->creation_time = tx+((((time_t)tm.tm_hour * 60) + tm.tm_min) * 60) + tm.tm_sec; + wpt->SetCreationTime(tx+((((time_t)tm.tm_hour * 60) + tm.tm_min) * 60) + tm.tm_sec); wpt->creation_time = wpt->creation_time.addMSecs(millisecs); if (global_opts.debug_level > 1) { time_t t = wpt->GetCreationTime().toTime_t(); diff --git a/gpsbabel/gtm.cc b/gpsbabel/gtm.cc index c8737207f..96c470dca 100644 --- a/gpsbabel/gtm.cc +++ b/gpsbabel/gtm.cc @@ -534,7 +534,7 @@ gtm_read(void) wpt->icon_descr = icon_descr[icon]; } fread_discard(file_in, 1); - wpt->creation_time = fread_long(file_in); + wpt->SetCreationTime(fread_long(file_in)); if (wpt->creation_time.isValid()) { wpt->creation_time += EPOCH89DIFF; } diff --git a/gpsbabel/gtrnctr.cc b/gpsbabel/gtrnctr.cc index d6ed2ffdf..a3abd5455 100644 --- a/gpsbabel/gtrnctr.cc +++ b/gpsbabel/gtrnctr.cc @@ -229,8 +229,8 @@ gtc_write_xml(int indent, const char* fmt, ...) static void gtc_lap_start(const route_head* rte) { - gtc_least_time = 0; - gtc_most_time = 0; + gtc_least_time = gpsbabel::DateTime(); + gtc_most_time = gpsbabel::DateTime(); } static void diff --git a/gpsbabel/igo8.cc b/gpsbabel/igo8.cc index 4de57a4d4..7b7d0d83b 100644 --- a/gpsbabel/igo8.cc +++ b/gpsbabel/igo8.cc @@ -165,7 +165,7 @@ static void igo8_read(void) wpt_tmp->latitude = le_read32(&point.lat) / (double)0x800000; wpt_tmp->longitude = le_read32(&point.lon) / (double)0x800000; - wpt_tmp->creation_time = le_read32(&point.unix_time); + wpt_tmp->SetCreationTime(le_read32(&point.unix_time)); track_add_wpt(track_head, wpt_tmp); } diff --git a/gpsbabel/interpolate.cc b/gpsbabel/interpolate.cc index caf380905..ce02ebeac 100644 --- a/gpsbabel/interpolate.cc +++ b/gpsbabel/interpolate.cc @@ -98,7 +98,7 @@ interpfilt_process(void) timen < wpt->creation_time.toTime_t(); timen += interval) { waypoint* wpt_new = waypt_dupe(wpt); - wpt_new->creation_time = timen; + wpt_new->SetCreationTime(timen); if (wpt_new->shortname) { xfree(wpt_new->shortname); } @@ -130,8 +130,8 @@ interpfilt_process(void) distn < curdist; distn += dist) { waypoint* wpt_new = waypt_dupe(wpt); - wpt_new->creation_time = distn/curdist* - (wpt->creation_time.toTime_t() - time1) + time1; + wpt_new->SetCreationTime(distn/curdist* + (wpt->creation_time.toTime_t() - time1) + time1); if (wpt_new->shortname) { xfree(wpt_new->shortname); } diff --git a/gpsbabel/itracku.cc b/gpsbabel/itracku.cc index f5bd46111..c06469610 100644 --- a/gpsbabel/itracku.cc +++ b/gpsbabel/itracku.cc @@ -295,7 +295,7 @@ to_waypoint(itracku_data_record* d) wp = waypt_new(); wp->longitude = deg_min_to_deg(le_read32(d->longitude)); wp->latitude = deg_min_to_deg(le_read32(d->latitude)); - wp->creation_time = decode_itracku_time(le_read32(d->creation_time)); + wp->SetCreationTime(decode_itracku_time(le_read32(d->creation_time))); wp->speed = KNOTS_TO_MPS((float)d->speed); wp->wpt_flags.speed = 1; wp->altitude = le_read16(d->altitude); diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc index 2c3bc644a..70eca5780 100644 --- a/gpsbabel/kml.cc +++ b/gpsbabel/kml.cc @@ -692,11 +692,11 @@ void kml_output_trkdescription(const route_head* header, computed_trkdata* td) } if (td->start && td->end) { gpsbabel::DateTime t; - t = td->start; + t = QDateTime::fromTime_t(td->start); if (t.isValid()) { kml_td(hwriter, "Start Time", t.toPrettyString()); } - t = td->end; + t = QDateTime::fromTime_t(td->end); if (t.isValid()) { kml_td(hwriter, "End Time", t.toPrettyString()); } @@ -715,9 +715,9 @@ void kml_output_trkdescription(const route_head* header, computed_trkdata* td) writer->writeStartElement("TimeSpan"); gpsbabel::DateTime t; - t = td->start; + t = QDateTime::fromTime_t(td->start); writer->writeTextElement("begin", t.toPrettyString()); - t = td->end; + t = QDateTime::fromTime_t(td->end); writer->writeTextElement("end", t.toPrettyString()); writer->writeEndElement(); // Close TimeSpan tag diff --git a/gpsbabel/lowranceusr.cc b/gpsbabel/lowranceusr.cc index c66f14720..aae47061d 100644 --- a/gpsbabel/lowranceusr.cc +++ b/gpsbabel/lowranceusr.cc @@ -410,7 +410,7 @@ lowranceusr_parse_waypt(waypoint* wpt_tmp) /* Time is number of seconds since Jan. 1, 2000 */ waypt_time = gbfgetint32(file_in); if (waypt_time) { - wpt_tmp->creation_time = base_time_secs + waypt_time; + wpt_tmp->SetCreationTime(base_time_secs + waypt_time); } if (global_opts.debug_level >= 2) { diff --git a/gpsbabel/mtk_logger.cc b/gpsbabel/mtk_logger.cc index be54d10aa..9fbdda485 100644 --- a/gpsbabel/mtk_logger.cc +++ b/gpsbabel/mtk_logger.cc @@ -774,7 +774,7 @@ static int add_trackpoint(int idx, unsigned long bmask, struct data_item* itm) if (bmask & (1<altitude = itm->height; } - trk->creation_time = itm->timestamp; // in UTC.. + trk->SetCreationTime(itm->timestamp); // in UTC.. if (bmask & (1<creation_time = trk->creation_time.addMSecs(itm->timestamp_ms); } diff --git a/gpsbabel/netstumbler.cc b/gpsbabel/netstumbler.cc index a48ea9193..91438008f 100644 --- a/gpsbabel/netstumbler.cc +++ b/gpsbabel/netstumbler.cc @@ -240,7 +240,7 @@ data_read(void) wpt_tmp->description = xstrdup(desc); wpt_tmp->longitude = lon; wpt_tmp->latitude = lat; - wpt_tmp->creation_time = mktime(&tm); + wpt_tmp->SetCreationTime(mktime(&tm)); waypt_add(wpt_tmp); } diff --git a/gpsbabel/random.cc b/gpsbabel/random.cc index 3954bf14d..61523057a 100644 --- a/gpsbabel/random.cc +++ b/gpsbabel/random.cc @@ -159,7 +159,7 @@ random_read(void) WAYPT_SET(wpt, depth, rand_int(10000) / 10.0); } - wpt->creation_time = time; + wpt->SetCreationTime(time); if RND(3) { wpt->creation_time.addMSecs(rand_int(1000) * 1000); } diff --git a/gpsbabel/src/core/datetime.h b/gpsbabel/src/core/datetime.h index b0e24eb9e..2ffd7c052 100644 --- a/gpsbabel/src/core/datetime.h +++ b/gpsbabel/src/core/datetime.h @@ -45,11 +45,7 @@ public: DateTime(QDate date, QTime time) : QDateTime(date, time) {} DateTime(QDateTime dt) : QDateTime(dt) {} - const time_t& operator=(const time_t& t) { - setTime_t(t); - return t; - } - + // TODO: this should go away in favor of .addSecs(). time_t operator+=(const time_t& t) { setTime_t(toTime_t() + t); return toTime_t(); diff --git a/gpsbabel/unicsv.cc b/gpsbabel/unicsv.cc index 779e44e6c..976bf75de 100644 --- a/gpsbabel/unicsv.cc +++ b/gpsbabel/unicsv.cc @@ -460,7 +460,7 @@ unicsv_parse_status(const char *str) #endif #ifdef UNICSV_GC_READY -static time_t +static QDateTime unicsv_adjust_time(const time_t time, time_t *date) { time_t res = time; @@ -473,7 +473,7 @@ unicsv_adjust_time(const time_t time, time_t *date) struct tm tm = *gmtime(&res); res = mklocaltime(&tm); } - return res; + return QDateTime::fromTime_t(res); } #endif -- 2.30.2